(command-line): Call frame-initialize explicitly.

Call face-initialize.
(normal-top-level): Call frame-notice-user-settings explicitly.

diff --git a/lisp/startup.el b/lisp/startup.el
index da88df9e8e1f8de3ec81881783c23f9bddc8088e..10777d018e19b16616561987f2b1ba5919702f55 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -147,6 +147,7 @@ directory name of the directory where the `.emacs' file was looked for.")
       (run-hooks 'emacs-startup-hook)
       (and term-setup-hook
           (run-hooks 'term-setup-hook))
+      (frame-notice-user-settings)
       (and window-setup-hook
           (run-hooks 'window-setup-hook)))))
 
@@ -212,6 +213,11 @@ directory name of the directory where the `.emacs' file was looked for.")
     ;; Re-attach the program name to the front of the arg list.
     (setcdr command-line-args args))
 
+  ;; Under X Windows, this creates the X frame and deletes the terminal frame.
+  (frame-initialize)
+
+  (face-initialize)
+
   (run-hooks 'before-init-hook)
 
   ;; Run the site-start library if it exists.  The point of this file is